*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 41746411502c10f7d1bda0240687d79937943126..06541e66e976b989632230455d9f6cbfd3ec6b72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-06  Gerd Moellmann  <gerd@gnu.org>
+
+       * make-dist: Handle leim/MISC-DIC.  Only include
+       `[a-zA-Z]*.{el,elc}' from leim/quail.
+
 2001-04-05  Gerd Moellmann  <gerd@gnu.org>
 
        * Makefile.in (install-arch-indep): Remove .cvsignore files.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6aadb3184e98c8d7c737d2e57e08188343fbebf6..8c42d6fc349b8c67ec3d7c18dd86234756ad9f4c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-04-06  Gerd Moellmann  <gerd@gnu.org>
 
+       * composite.h (COMPOSITION_VALID_P): Allow integers as cdrs of
+       PROP.
+
        * xdisp.c (Qinhibit_eval_during_redisplay): Make it a Lisp_Object.
 
 2001-04-05  Gerd Moellmann  <gerd@gnu.org>